From: Eli Zaretskii Date: Sat, 20 Oct 2012 16:17:25 +0000 (+0200) Subject: Merge from trunk. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~1399 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6d03e7beda333663080a64af902231342fd941cf;p=emacs.git Merge from trunk. --- 6d03e7beda333663080a64af902231342fd941cf